GRECLIPSE-1638 Fix and tests