Merged changes from work