GRECLIPSE-1748 Fix and tests