Merge pull request #7965 from eileenmcnaughton/comments