Merge changes from 'owner'