Merge branch 'release/2.1' into develop
Merge branch 'hotfix/2.1.1' into develop
Issue a warning when Ini-file contains device ID that is now missing
Merge branch 'develop'