multiarch-fixes merge proposals

No entries.