Merge branch 'jc/merge-symlink' into maint