Merge branch 'tb/clone-local-symlinks' into maint-2.30