Sync v3-0-stable with 3.0.5rc1 changes
#54467
Merged
v3-0-stable with 3.0.5rc1 changes
#54467