Merge "Use and reparent the task's dim" into main