Merge proposals

adaptee has no merge proposals.