Merge remote-tracking branch 'rootbox/jb-mr1' into HEAD