2f360a3fd7
Fixes #9610 (cherry picked from commit 0871208023b46452fbf26f9baebea82cecb33f39)
Fixes #9610 (cherry picked from commit 0871208023b46452fbf26f9baebea82cecb33f39)