DDF-487 Modify "TODO" to point to a specific ticket