Merge changes I283fe25a,Iabef0b10

* changes:
  Support new binder32bit property
  Expand a leading '~' to $HOME in arg for --local