Merge branch 'master' into ew-dev
Field string_id has been created in table logger_device_type.
Merge branch 'ew-dev'