MYO-1452

Owned by catiewith@TH