Stable6 resolve symlinks

Backport of some crucial  master changes