Refactor zolog from regen_event changes
Merge branch 'big-refactor-from-regen_event'