[ruby-core:114875] [Ruby master Bug#19897] Please backport fixes from #18914 into Ruby 3.1 / 3.0