Merge commit 'vanilla/master' into refs/top-bases/master