GRECLIPSE-1727 Fixes are moved to new branch
Merge branch 'DenisMurashev-GRECLIPSE-1727-FIX'