JBIDE-14363 updates as per max's suggestion