Backport version 1.5.20 to 1.20.1#74

Lunascaped wants to merge 2 commits intoDrexHD:backport/1.20.1DrexHD/Vanish:backport/1.20.1from

Lunascaped:backport/1.20.1Lunascaped/Vanish:backport/1.20.1Copy head branch name to clipboard