GRECLIPSE-1723 Fix for immutable field type
GRECLIPSE-1723 Minor fix
Merge remote-tracking branch 'remotes/origin/GRECLIPSE-1723'