MYO-0695

Owned by shizuai@TH