Merge "Add QoS filter matching and unit tests"