Merge "Fix C++ deprecation warning." into main