Merge "Add bug references to TODO."