Properly handle paths with symlink path components Upstream-commit: 754797bba7e9e18a94ed73c8f94fa91973e547c3 Component: engine