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