Merge "Log fatal if transaction callbacks are called more than once" into main