Changes for new demux FW