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