New upstream 3.5.1