upstream 2.8.16