Issue 18845: More changes for ToDo status