Commit 0f20c236 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.5.x'

Closes gh-27112
parents f23fa282 4e8d4669
Pipeline #395 failed with stages