Merge "Update work fab radius to match height" into sc-dev