Various fixes for C++20, backported from Run2Support

Backport of Run2Support

Merge request reports

Loading