Merge pull request #3847 from 3scale/ruby-3.1

Merge pull request #3847 from 3scale/ruby-3.1 #596