Merge from inglesp-spike-one