Merge branch 'device-properties'