Merge branch 'tb/clone-ssh-with-colon-for-port' into maint