Merge "Make transaction enforcement stricter"