Update Master to Export/UI Changes

Do you think we need to test this further?
Redundant `self` detected.<br>Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.