Merge "add more comments from the other file" into nyc-dev