[minor] Cosmetic comments
Merge remote-tracking branch 'origin/buffered-read' into buffered-read
Merge branch 'buffered-read' x2