Merge proposals

Trifon has no merge proposals.