[389-devel] Please review: PRs - 50924, 50922, and 50918