Merge proposals

Griffith has no merge proposals.