Merge "Remove unneeded binder call" into main