Initial merge of IR state machine timer