ENG-5528 Fix timestamp termination issues