Merge "Replace BBQ callback thunks with lambdas" into main