JBIDE-15163 to maint.