Merge branch 'jc/merge-symlink-ours-theirs' into maint