Hi Mark, team,
please check the PR for finalization:
https://github.com/389ds/389-ds-base/pull/4514

Thanks,
Simon