@sathomas : You're right in saying that changing this to `globalEnabled` will break backwards compatibility, but I think we can manage that in this case by just making the config changes when we deploy. We'd have to do that anyway as the tenant tracking values would be in the global ones. So I'm still in favour of changing this to `globalEnabled` and `globalId`