all device_tpl add
Merge remote branch 'origin/development' into development