GRECLIPSE-1727 Fixes are moved to new branch