Merge proposals

lp-398 has no merge proposals.