Merge missing commits from 1.2.0-beta1 release branch (#11319)

This commit is contained in:
Luiz Aoqui
2021-10-14 16:10:05 -04:00
committed by GitHub
parent d17b6a2c2b
commit 600bf12b75

File diff suppressed because one or more lines are too long