Manualy merged sabas/edifact last changes