Interaction with safe

I am merging the interactionWithSafe branches of all the repositories, to be merged with the 9.0.0 version of our OAE fork.