Importing patch for EXT-5571 for Beta 3 release. Fix by Callum originally.
Importing patch for EXT-5571 for Beta 3 release. Fix by Callum originally.

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