Add quotation marks for $CURDIR Upstream-commit: 6c0d6236117effb139dd3d3edf984877f81e0a94 Component: engine