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