Merge code changes from upstream r661

Just comment changes
Merge code changes from upstream r663
Merge code changes from upstream r664