Merge remote-tracking branch 'sm/sm-jb-mr1-wip' into sm-jb-mr1