TERRA-392: Endzela

Owned by Benaberrry