Merge "skip filtered entries instead of returning" into oc-mr1-dev