Merge "Fix C++23 build." into main