Merge branch 'ef/maint-clone-progress-fix'