Fixes #9054 (cherry picked from commit 23432e44050cd8638f070745edf77be75aeffe21) (cherry picked from commit 255eda6d8eff79efca2e892efea89e40be58a79f)
Fixes #9054 (cherry picked from commit 23432e44050cd8638f070745edf77be75aeffe21) (cherry picked from commit 255eda6d8eff79efca2e892efea89e40be58a79f)