Merge "Ensure Exceptions when reporting Transaction results does not cause a stall" into main