add missing parameters
add options to device mapping
test the device options parameters
Merge branch '5002-switchboard-opt'