Fixes #7615 - filter ignore current context
(cherry picked from commit 76fca93b0093e9b4174d1a888ffca9f3fcb886c9)
Fixes #7615 - filter ignore current context
(cherry picked from commit 76fca93b0093e9b4174d1a888ffca9f3fcb886c9)