DOCSP-21871: Backport DOCSP-20358 to v2.11 #366

Closed jwilliams-mongo closed 2 years ago