Fix C++20 compilation error (reported by email). Putting in rel 23.0 (to be swept) to limit divergence between master and 23.0.
