MYO-697

Owned by MarexDev@TH