Merge changes from work comp