Fixes #12595 Signed-off-by: Travis Thieman <travis.thieman@gmail.com> Upstream-commit: 2167f40a766d1909443695d96bcecc3d039fb482 Component: engine