Merge "Change NBAIO_Format from typedef to struct"