Do not merge yet. I am waiting to receive rotor parameters from Olivier.
I'll commit them, and then ask for the merge.