Fixes #9105 (cherry picked from commit ceaf579cb0b4b0ecdf2e56f245a2fad2b6ed2e85) (cherry picked from commit 366219d7f59054f6582900f284b4095844a78373)
Fixes #9105 (cherry picked from commit ceaf579cb0b4b0ecdf2e56f245a2fad2b6ed2e85) (cherry picked from commit 366219d7f59054f6582900f284b4095844a78373)