merge trae's changes into knife-ssh