Merge branch 'jb-4.2.2'