Fix linked resoruce paths
Merge branch 'fix-linked-resources'