Merge "Pick up device configuration "device.internal = 0". Before, only "device.internal = 1" had an effect."