MPS-20265 Failing Merge causes UI deadlock