Fix symlink mounting issues Upstream-commit: e56562c35e0ef39a02c171f60fccd6588edb8846 Component: engine