TS-2257 More fixes for healtchecks plugin losing events