Merge "Revert^3 "Speed up large settings requests."" into main