Merge in 'release/6.0.1xx' changes

This commit is contained in:
dotnet-bot 2022-02-06 17:52:52 +00:00
commit dde9bf359b