Merges Z1SP into Z1 platform