Merge "Fix config-manager activator"