Merge pull request #8032 from eileenmcnaughton/comment