New upstream update #1475