Add support for fuzzy die tracking (closes [8bc9b13fd4])