Merge "sf: avoid assumption remote binder is local" into rvc-dev