*merge commit 9ed083d8ccc6186448c3558c6f40b40ba0b1568a
*BACKPORT
*merge 4 commits
*FEATURE: attribute/xattr support.
*BACKPORT