Add zerowiki

RT #6831

Change-Id: If57562ff309688ab08a2b4e9a81bdf95163176af
Merge "Add zerowiki"