Merge branch 'for-5.1/atomic-replace' into for-next