After #5285 is merged: need to make time-averaged diags compatible with adaptive time stepping #5176 .