Sync v2-2-stable
with v2-2-test
to release 2.2.5
#22477
Merged
v2-2-stable
with v2-2-test
to release 2.2.5
#22477