fix ARCH detection and normalization#8658

mubix wants to merge 2 commits intomakeplane:previewmakeplane/plane:previewfrom

mubix:previewmubix/plane:previewCopy head branch name to clipboard