Merge changes from work