Merge pull request #19181 from BruceForstall/UpdateComment