am 0ffa9713: DO NOT MERGE Fix generic filter check

* commit '0ffa9713dc66c4b0db3027a1edab52c99a3af129':
  DO NOT MERGE Fix generic filter check