add options field to device
Merge branch '5002-switchboard-opt'