Merge "Properly handle 2D filter boundary extension" into nextgenv2