SERVER-9038 merged in fixed based on codereview