Readying 2.1 change
Added files around fix for device ID break