Merge "Fix Binder warnings after C++ bump to 20" into main