S2716 pull request reorganization #1

Improvements to MetricsFilter