Note gz change
Backport matches_filter
Merge branch 'master' into 4.x
Revert "Backport matches_filter"

This reverts commit 40f2810608500e660b235051c1b76a5a6dc6df16.