Merge "Clean up redundant fields in TaskContainer" into main