Merge "Fix 12 TAP convolution bug" into nextgenv2