There seem to be other changes in the PR that are unrelated to code comments.