Merge branch 'jk/maint-clone-shared-no-connectivity-validation'