Maintenance on hdc/zapat46