Disabled cache in DeviceDAO->getWithDeviceClassAndNetwork
Merge remote-tracking branch 'origin/master'