I think we need an extra flag here to enable this behavior, something like `self.use_close_dt_for_benchmark`, and have that set to `False`, for now; so that existing use of the benchmark timestamp does not break.