Merge branch '2028_hex_search_memleak'