[PATCH 11/13] Improve management of complex devices in custom spoke. (#865199)