Merge proposals

testdrive has no merge proposals.