Merge remote-tracking branch 'mokee/jb-mr1_mkt' into HEAD