Merge "Refactor int/pack timer triggers, reduce infra"