Hangout 58 code committed