Merge "Deprecate old config-manager model attributes"