New upstream update #1475

New upstream update #1475