[FIX] Failing test cases in Devices and Prizes
Merge remote-tracking branch 'origin/develop' into develop