Merge pull request #6550 from stokito/devices_unspecified