Merge proposals

upstream-coverage has no merge proposals.