Pick and add extra changes for 4.0.0 version #7151

Job	Run time
Rubygems on Windows (3.2)	4m 27s
Rubygems on macOS (3.2)	3m 2s
Rubygems on Ubuntu (3.4)	4m 12s
Rubygems on Ubuntu (3.2)	2m 1s
Rubygems on Ubuntu (jruby)	7m 0s
Rubygems on Windows (3.3)	4m 11s
Rubygems on Windows (3.4)	3m 53s
Rubygems on macOS (3.4)	4m 18s
Rubygems on Ubuntu (truffleruby)	3m 37s
Rubygems on macOS (3.3)	2m 8s
Rubygems on Ubuntu (3.3)	2m 6s
All rubygems jobs pass	4s
Rubygems on Ubuntu (3.3)	2m 6s
Rubygems on macOS (3.3)	2m 8s
Rubygems on Ubuntu (3.4)	4m 12s
Rubygems on macOS (3.4)	4m 18s
Rubygems on Windows (3.3)	4m 11s
Rubygems on Ubuntu (truffleruby)	3m 54s
Rubygems on macOS (3.2)	3m 2s
Rubygems on Windows (3.2)	4m 27s
Rubygems on Windows (3.4)	3m 53s
Rubygems on Ubuntu (jruby)	7m 0s
Rubygems on Ubuntu (3.2)	2m 1s
All rubygems jobs pass	5s
	1h 22m 16s

Provide feedback