merge in jb-mr1-release history after reset to jb-mr1-dev