Pull #651 predates the switch to C++20. Pull in master to provide the C++20 support needed by some tuning commits.