Latest changes - replace build_count with instance_uid