Merge branch 'rs/ipv6-ssh-url' into maint