sync with 69949 : fix a bug about filter callback