Merges Z1SP into Z1 platform
Merge pull request #739 from alignan/merge_z1sp_with_z1

Merges Z1SP into Z1 platform