Backport 3.0.8+ remotectl driver