Backported from Viewer-Dev (14028 (1be62434c3a6) Fix for EXP-201 -- "Clean shutdown")
Backported from Viewer-Dev (14028 (1be62434c3a6) Fix for EXP-201 -- "Clean shutdown")

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm