Added Zombie properties
Merging "TestingFeature1" with "master"