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