Rebase auto-squash and a little patch shuffle

Rebased and autosquahed the -1 branch. Created a new commit disabling macOS elevated installer in the base section and added #41164 (closed) to do it proper later.