Device update bugfix
Merge commit 'f05bf5f70d1c0d4f450263e16b3204304a3dd854' into hotfix/testhotfix

* commit 'f05bf5f70d1c0d4f450263e16b3204304a3dd854':
  Device update bugfix
Merge branch 'hotfix/testhotfix' into develop