PHOENIX-1321 Cleanup setting of timestamps when collecting and using stats