upstream 0.7.33