JBIDE-11287 and JBIDE-18036