datagen: Updated for 1.21.120.#3

didntpot wants to merge 3 commits intodf-mc:masterdf-mc/datagen:masterfrom

aerisnetwork:masteraerisnetwork/datagen:masterCopy head branch name to clipboard