ece9696ba5
Fixes #67201 (cherry picked from commit 0000a568bd83f70905dcec1d7428403268849caf)
Fixes #67201 (cherry picked from commit 0000a568bd83f70905dcec1d7428403268849caf)