Greclipse 1723

These changes are to be applied after applying of fix for GRECLIPSE-1731