[389-devel] Please review: PRs #4321 and #4320