18845 - Changes for ToDo status

For John's review