Merge "Fixed file attributes"