Merge pull request #1359 from tnull/2022-03-real-random-shuffle