Merge branch 'rs/move-array' into maint