Backport of !7578 (merged)
Originally https://gitlab.isc.org/isc-private/bind9/-/merge_requests/483
See #3622 (closed)