Improvements to comment embedding
Merge pull request #1859 from vanillaforums/hotfix/comments-improve

Improvements to comment embedding