Merge "Loopfilter fix" into nextgenv2