Revert "Revert "merged agence""

This reverts commit ca963e43f57cc8cb9845d4bf0640fe72d1362625.
Revert "merged agence"

This reverts commit e54c857a1aec142e14a59d6bf0e490360a030b65.