Merge changes to handle owner/group