PLA-833 PLA-989 fix for suggestions broking editor
PLA-833 PLA-989 restoring changes
Merge branch 'PLA-833' into dev