Update Master to Export/UI Changes

Do you think we need to test this further?
Line is too long. [94/80]<br>Align the parameters of a method call if they span more than one line.