Merge branch 'jk/cleanup-failed-clone' into maint