Merge "Avoid mv cost check for invalid mv values"