Move blob specific rule matching stuff to blobs.
Merge latest from upstream.