New upstream update #3702

3702