merge from spartan-array