Proper initialization of device
Resolve merge conflicts with master