Merge commit 'vanilla/master' into refs/top-bases/t/extra-actions/log-consolidate