JBIDE-14831 to master b2