Merge "Fix config-file provider path"