JBIDE-13947 to master