manually merge c7fc38edc356944df1cafe5a5c68fa8112e03136 from upstream mongo