Sync v3-0-stable with 3.0.5rc2 changes
#54520
Merged
v3-0-stable with 3.0.5rc2 changes
#54520