Merge branch 'ps/fetch-cleanups'