Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> (cherry picked from commit d43a41d7af7c4858e4b2ed41775c34b92cd35179) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: ce875b746bdcc37ff1c92dc181c78ba619d02d24 Component: engine