[#1805] Assertifying the random resource.
Merge into master