PLA-833 PLA-989 restoring changes
Merge branch 'PLA-833' into release-197-pla-989-suggestions-editor-fix