3.5/f/filter abort fix


3.5 version of f/filter-abort-fix