Merge "Avoid crashing on bad architecture value." into main