Merge proposals

bugchecker has no merge proposals.