pre 2.0 minors and final b82f705