Merge pull request #3345 from eileenmcnaughton/comments