Update Master to Export/UI Changes

Do you think we need to test this further?
Avoid using {...} for multi-line blocks.<br>Trailing whitespace detected.