Maintenance on hdc/zapat12