Merge branch 'jk/ref-symlink-loop'