MYO-0660

Owned by parado@TH