Merge "Remove bytes matcher from base"