Merge "Improved code coverage for record filter strategies"