MYO-353

Owned by kiplings@TH