added todos
applied patch for issue21793