Merge branch '2.5.x'

Closes gh-27112
Status Job ID Name Coverage
  Build
failed #1183
build

 
  Test
skipped #1185
allowed to fail
code_quality
skipped #1184
test
 
Name Stage Failure
failed
build Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job trace