MYO-6072: Elliot

Owned by Rynnu