Merge pull request #6421 from mikeller/add_dynamic_filter_parameters