Merge "Zone Export - some refactoring and new test case to scenario test suite"