add patch factor-out-xattr-moving