Merge "Fix warnings in config-manager"