Merge "Rewrite hex search function"