Merge pull request #17717 from colemanw/jsComments