Merge pull request #11882 from eileenmcnaughton/report_filter