Merge branch 'rs/copy-array' into maint