Merge "Fixing a typo in "TODO" message"