JBIDE-13965 to master / b2