Re: Backport smb client char/block fixes