Use filepath instead of path Upstream-commit: 949f2ca8cbddadc00f9430b6f5ce50fd5a5dcb52 Component: engine