Bisous !

Sync up our needs with yours to facilitate future merge