Add current zone, visible
Merge branch 'antonin'