Merge "Make unclosed transaction errors more useful"