Archives shuffle

Merged 🚄 Job van der Voort 🚀 requested to merge archives-shuffle into master