FIRE-6077 et al: Adding in old code to make future merges easier.
FIRE-6077 et al: Adding in old code to make future merges easier.

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