GRECLIPSE-1773 Fix and test
Merge branch 'GRECLIPSE-1773'