Submitted patch for integration and bug 996712