[PATCH 0/3] Threshold event improvements