[work item 2535] Added another TODO item