GRECLIPSE-1753
Fixed