Fixes #17107 - list override in filter API
(cherry picked from commit 963d2d8f57bc2c0ab4a2773a863e8c083b18c630)
Fixes #17107 - list override in filter API
(cherry picked from commit 963d2d8f57bc2c0ab4a2773a863e8c083b18c630)