Merge commit 'refs/top-bases/t/projlist-cache/caching' into t/projlist-cache/caching