[heat] Addressing the large patch backlog.