Merge "Update out-of-date TODO comment" into main