Merge "Refactor profile dir creation"