Several fixes missing from the ruby 2.7 branch

Merge request reports

Loading