main
Merge branch 'release/2.1' into release/2.2
Made the encodings of .razor and .cshtml files in the repo consistent (#23502)