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