Manually merging case generation

So that it’s still in the main branch