Rebasing
Patch for 796009 landed