Merge branch 'master' into JBIDE-15429