Merge tag 'v6.0.0-rc.2.21480.5' into juhoyosa/merge-rc2-rel
authorJuan Sebastian Hoyos Ayala <juhoyosa@microsoft.com>
Wed, 13 Oct 2021 19:01:48 +0000 (12:01 -0700)
committerJuan Sebastian Hoyos Ayala <juhoyosa@microsoft.com>
Wed, 13 Oct 2021 19:01:48 +0000 (12:01 -0700)

Trivial merge