Merge branch 'nd/clone-connectivity-shortcut' (early part) into maint