Merge "Fix search for values in blkId output"