Merge "Do not use default locale to create file path"