Merge "Revert "Move `stride` into `cb_handle_t` from `cb_handle_30_t`""