Merge pull request #21675 from colemanw/commentCleanup