ZI-5: now it's 5

added 9778769fe1d5b05b7d92e2c5f896b37a commit 1

added 5308600874e68f6e170d8b33cfa3bc26 commit 2
Merge pull request #2 from fusiontestaccount/ZI-3-test-branch-squash

Zi 3 test branch squash