Merge proposals

Jerome has no merge proposals.