Merge "Actually count explicit broadcasts as usage" into sc-dev