zog local config
Merge branch 'zog' into dev