Merge "Removing a TODO line" into main