Merge "Improve transaction logging"