New branch ETAPE-2 up to date