Merge "[DO NOT MERGE] Fix a bug with filtering by raw bytes" into oc-dev