Merge "With on demand border extension, clamping the MV is not longer needed."