Merge proposals

defect has no merge proposals.