Greclipse 1573

GRECLIPSE-1573 (subtask of 1702) fixed