Merge "fix dir creation mode"