Merge branch 'nd/clone-connectivity-shortcut'