Merge proposals

CR. Middaugh has no merge proposals.