Merge "Fix default consumer usage bits on BBQ consumer" into sc-dev