New upstream 3.7.8