Version bump and GRECLIPSE-1801 fix