Maybe fixes #8953, #9060 (cherry picked from commit d522d6d545bfbd4e4f8f60975bddcd5f6bcc69ac) (cherry picked from commit b42c5b58ea6fe1ee8121143d0f53fd9adf1e7f3d)
Maybe fixes #8953, #9060 (cherry picked from commit d522d6d545bfbd4e4f8f60975bddcd5f6bcc69ac) (cherry picked from commit b42c5b58ea6fe1ee8121143d0f53fd9adf1e7f3d)