Adopt comments from master branch