random: Update from 3.18-rc3