Backport xy_sub_filter_rc3 changes to vsfilter_rc