Merge "Use synchronous transactions to simplify BBQ test" into main