Merge "Fix unit test failure due to ext-inter and dual filter" into nextgenv2