Merge branch 'jk/fail-null-clone' into maint