DOCSP-21870: Backport DOCSP-20358 to v2.12 #365

Closed jwilliams-mongo closed 2 years ago