Merge branch '1535_vfs_sftp_fixes'