Merge branch 'newarray' into nextversion