Merge "Remove double counting for mv costs" into nextgenv2