Rebase2

This is a rebase/modif to remove the symlink from the history from PR gh-1400.

fixes gh-1400