Merge branch 'rt/maint-clone-single'