SERVER-14268: Backport from 2.6 to 2.4