Merge "Fix bugs in convolution filter optimization" into nextgenv2