Merge "Avoid setting the same TaskDescription" into main