Structured comments hot fix
Merge pull request #4993 from guardian/structured-comments-hotfix

Structured comments hot fix