Merge "Use TaskContainer as source of truth around Task handling" into main