Merge branch 'tz/complete-branch-copy' into maint