Merge branch 'impro/switch-xattr-header'