Merge proposals

private_lock has no merge proposals.