MYO-0528

Owned by fcrtune@TH