SH-1904 FIX (cherry pick from original by bao)
SH-1904 FIX (cherry pick from original by bao)

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