Merge branch 'master' into protocol-version2