Merge "Fix config dir name"