Merge pull request #6635 from eileenmcnaughton/comments