Merge pull request #67 from adietish/JBIDE-14366-24x

Merged by openshift-bot