JBIDE-15357 maint