better task reconciliation for 0.20.x