JBIDE-18861 and JBIDE-18862 for maintenance