Merge "Show task name in hierarchy" into main