Merge "Remove an obsolete TODO comment" into main