Merge pull request #9541 from xurizaemon/CRM-19768-comment_only