SERVER-11021: backport to 2.4