JBIDE-15478 updates as per requests on PR