I want to cherry-pick the attached commit back to 3-4, the .sdw import of the binfilter is broken otherwise as timar noted. May need git am --ignore-whitespace or whatever to apply. C.