#19586 Comments break after posting a comment
Merge pull request #52 from ncatanchin/19586

Code Review for Job #19586