JBIDE-13959 and JBIDE-9830