upstream 2.8.17