Commit amended to undo change to device list management, still working through that merge request. Want to work this one in first. Changes by Adam Honse <[email protected]>