a585b0a
add upstream patch for #67605 (cherry picked from commit bd156d288ed98a9ebb209bb925e8dbbd9675ec0e)