JBIDE-14107 - changes as per PR review