Merge commit 'refs/top-bases/t/config/homepage' into t/config/homepage