JBIDE-14704 to master