GRECLIPSE-1682 A few comments were added