Merge branch 'jc/t5601-copy-workaround' into maint