GRECLIPSE-1129 Fix and tests
GRECLIPSE-1129 Additional test and fix
Merge branch 'GRECLIPSE-1765'