Update Master to Export/UI Changes

Do you think we need to test this further?
Perceived complexity for to_folder_export_hash is too high. [17/7]<br>Inconsistent indentation detected.<br>Surrounding space missing in default value assignment.