This is a sweep of the fixes for EVNT-to-EVNT filtering introduced for 21.6 here: !39376 (merged)
There was an expected merge conflict due to changes in the linked libraries in 22.0. Here the commits from !39376 (merged) are cherry picked and the merge conflict on aa3e6759 is addressed by adopting the file from master and adding the necessary libraries for the fix, resulting in b8028e34.