Merge branch 'ps/fetch-atomic-fixup'