Merge branch 'tm/fetch-prune'