Merge "Tether-related commands porting"