Merge proposals

ppa-smoketest-dev has no merge proposals.