Merge pull request #12159 from nashby/issue-12149

do not break params filtering on nil values