Merge "Revert^2 "Add OEM compatability options for archiving."" into main