Sync v3-0-stable with 3.0.6rc1 changes
#54808
Merged
v3-0-stable with 3.0.6rc1 changes
#54808