Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com> Upstream-commit: 6fd8e485c85c4f8ca62578d0840bdeddc4cba151 Component: engine