preparing merge from SERVER-25
preparing merge from SERVER-25