ae3478d13e
Fixes #2820 Upstream-commit: 3ed0ff85f52b211746ffa10d968e43b9e3f93416 Component: engine
Fixes #2820 Upstream-commit: 3ed0ff85f52b211746ffa10d968e43b9e3f93416 Component: engine