Merge "Fix a DIR missing setting"