Merging jenad updates

Updating device config as jenad