Merge commit '2c563880ea' into work.xattr