update to upstream 73f26e34e8c642bf493a63fe14f005563a19d183