Merge "Refactor ssh commands" into v2.0