Merge branch 'jk/test-copy-bytes-fix' into maint