Merge branch 'master' into protocol_2