Merge "Fix potential issue with transaction timeouts"