Fixes #16461 - expose override in filter API
(cherry picked from commit 9bdc4fea9711290431b611337ac72c2003dc8efd)
Fixes #16461 - expose override in filter API
(cherry picked from commit 9bdc4fea9711290431b611337ac72c2003dc8efd)