Update from EBUio version