Add linked dirs
Merge branch 'hotfix/addlinkeddirs' into develop