Maybe fixes #8440 (cherry picked from commit e052bdef96c133b92dfad214c2b05ab03d4c5866) (cherry picked from commit ab8c8db6acc3070203c15f5938c948eeff0431c5)
Maybe fixes #8440 (cherry picked from commit e052bdef96c133b92dfad214c2b05ab03d4c5866) (cherry picked from commit ab8c8db6acc3070203c15f5938c948eeff0431c5)