Fixes #47297 (cherry picked from commit 9906daa) Co-authored-by: Toshio Kuratomi <a.badger@gmail.com>
9906daa