Fixes #9295 (cherry picked from commit 776d36caf11cf29287e4cb86a6e64574a296f89c) (cherry picked from commit 4f984cef5f28f98ba60efb6cb84b5eaecb2d77ca)
Fixes #9295 (cherry picked from commit 776d36caf11cf29287e4cb86a6e64574a296f89c) (cherry picked from commit 4f984cef5f28f98ba60efb6cb84b5eaecb2d77ca)