committing patch for bug #2958