Merge "Adding device name"