Merge branch '2.4' into blur_border_isolated