Merge "Host support for prefer symlink"