Merge "Convert rollback type to string to improve logging"