Merge pull request #2985 from TheBlueMatt/2024-03-fix-upgradable-enum-121