Merge "Fix config file name setting"