MYO-0689

Owned by parado@TH