Merge "Add support for measurement filtering"