Ongoing patch for hadoop-10641