re added zenx
enabled ZENX
Merge branch 'reborn-testing' into reborn-2.0