Merge remote-tracking branch 'cedric/refactor/nommage_inclure'