JBIDE-13213 to master