GRECLIPSE-1776 Fix and test
GRECLIPSE-1773 Possible fix
Merge branch 'GRECLIPSE-1773'