Merge branch 'fix-folder-links'