JBIDE-13893 maintenance