MBS-8491 fixed this for works but it needs to be fixed for other entities.
MBS-8491 Work merges aren't happening