[Task-mgr] Merge 3.0 into 2.4

No match.