Merge "Remove a TODO that is no longer relevant" into main