Adding the comments from master into the branch