S2716 pull request reorganization #1

Improvements to MetricsFilter
You removed the newline at end of file.  You should add it back, so it doesn't show as a diff.