JBIDE-14664 to master