JBIDE-13566 to master