JBIDE-14363 with fixes from PR comments