Merge "Refactor ssh commands" into v2.0

No match.