Once T172914 we need to make is compatible with disabledUsageAspects.
I suggest to make disabledUsageAspects coarse graining e.g when adding a claim, and C is in disabledUsageAspects, we will fallback to O. (instead of just removing C). So instead of disable it will be rather replacement.
This could be implemented in SqlUsageTracker.