MYO-653

Owned by VRaulu@TH