DOCSP-21869: Backport DOCSP-20358 to v2.13 #364

Closed jwilliams-mongo closed 2 years ago