sftp bug fixes
Merge branch 'sftp-bugfix' into develop