New upstream update #3702