Re-working in terms of changes to TaskSetManager. Verified with Standalone and Local mode.