MYO-1598

Owned by squishtube@TH