v2.0.x: refactor task/UnitsReady