Update Master to Export/UI Changes

Do you think we need to test this further?
Redundant `return` detected.