Merge "Add ability to have device-name based options"