merge from the spartan-array:master