JBIDE-14844 updates as per nboldt's comments