Backport of !7575 (merged)
Originally https://gitlab.isc.org/isc-private/bind9/-/merge_requests/477
See #3619 (closed)