Fix FIRE-14282/BUG-6875 with the solution provided in LL's jira.
Fix FIRE-14282/BUG-6875 with the solution provided in LL's jira.

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