Merge branch 'deviceManager'