GRECLIPSE-1748 Fix and tests
Merge branch 'GRECLIPSE-1748-ALT'