CB-7774 capture updates from Hangout and mailing list

Agreed. Fixed in a separate commit.