I have attached patch for 10.0.x. please review