Merge wip-array refactor, up to cd43fdc5b7a7c