Merge branch 'ps/fetch-optim-with-commit-graph'