Sib/feature/devices switch