Merge branch 'DenisMurashev-GRECLIPSE-1727-FIX'
GRECLIPSE-1752 Fix & tests