Merge in work changes