Branch force pushed by viniciusrp at 2024-12-20T12:30:18+00:00, 2.6.x moved from this tag to 6a719b8215fc13bf6c764b610c8e3471e09a38f7
tagging 2.5.18
Revert issue with #3405919