Merge branch 'genete_device_settings'