New upstream 3.12.2