The generator implemented in #23767 should be added as a step after release so that the fix is checked back into master automatically