Add support to IR Indicator, and update protocol