SH-531 / CTS-324 FIX fix of VWR-20749 / SNOW-624 lost in merge
SH-531 / CTS-324 FIX fix of VWR-20749 / SNOW-624 lost in merge

Re-applied fix originally committed in 1e93695ded30
Reveiewed code, appears straightforward.

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