JBIDE-18412 and JBIDE-18411