Merged #244 "Implement user/team difference detection"