JBIDE-13825 to master