Branch force pushed by robertragas at 2024-09-30T08:15:46+00:00, 2.6.x moved from this tag to e7f81b4283ff4883a7d6eaef70a812542d47a5e5
tagging 2.5.18
Revert issue with #3405919