https://bugs.openldap.org/show_bug.cgi?id=9235
--- Comment #3 from Ryan Tandy ryan@openldap.org --- FTR I've been working on these last items and I'm quite close to posting a PR.
WIP branch is https://git.openldap.org/ryan/openldap/-/commits/its9235 - I can put it up as a WIP: MR if that would be useful.