Merging stashed changes with updated upstream
Moves exceptions out of the exception namespace