Merge branch 'feature-device-objects'