Merge "Some refactoring and cleanups of interp filter" into nextgenv2