merge
merge
Get Device Configuration fix