Fixes #8659 Signed-off-by: Brian Goff <cpuguy83@gmail.com> Upstream-commit: 66fba7c46ed3507166774ec8000ca478907e80a7 Component: engine