Merge "Adds masked variance and sad functions for wedge" into nextgenv2