Fixes from jubeormk1's sftp branch#31

mkj merged 3 commits intomainmkj/sunset:mainfrom

pr/jubeormk1-bitsmkj/sunset:pr/jubeormk1-bitsCopy head branch name to clipboard