Merge "Fix compound mv costing for ref-mv." into nextgenv2