Fixes #10233 Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan) Upstream-commit: 06af013f8bdf5c9af85c4b3f158292d79ab644a5 Component: engine