GRECLIPSE-1545 Fix updated and unit test added
Merge branch 'GRECLIPSE-1798'