(#2325) - Update mapreduce