Merge proposals

Amandine has no merge proposals.