Complete refactoring of catalog zones, little fixes/enh

Merge request reports

Loading