MYO-1493

Owned by catiewith@TH