also update device.map
Merge branch 'device_map'
update version and changes