Merge "Improve loopfilter function"