Adding zonename to specs.
Merge branch 'test' into dev