JBIDE-15310 DEPENDS ON PULL 120

First commit is from PR 120