JBIDE-14583 to master