Merge "Revert "Use the global default cpp_std."" into main