Integrated origin/ready/google-comments
Integrated origin/ready/adam
merged