Merge proposals

I. Felix has no merge proposals.