Merge "Fix Linux Binder warning on gcc" into main