Merge commit 'refs/top-bases/next' into next