Merge pull request #22995 from scmmishra/fix-margin-for-filter