Remove use of deprecated filter functions Upstream-commit: a343cba40c25deb2893e13f9a81dbcc4d19d16e2 Component: engine