Merge branch 'jb-devel-mr2-release' into jb-devel-mr2-staging