Merge pull request #12199 from rabbitmq/mergify/bp/v4.0.x/pr-11702

Merge pull request #12199 from rabbitmq/mergify/bp/v4.0.x/pr-11702 #18169