Merge "Account for zero-forcing operation in selective ref mv mode" into nextgenv2