ab1b931dcc
Fixes #9943 (cherry picked from commit 77a8a4229c9fbf1b601a448dc919f3c5daa94985)
Fixes #9943 (cherry picked from commit 77a8a4229c9fbf1b601a448dc919f3c5daa94985)