New upstream update # 929