AI founds city, my military and GP on the same tile get pushed to different tiles, leading to immediate death of GP

[danielsolaro]

_1. Mod Version: 4.16
EUI with VP, no 43civ

3. List of Other Mods
All mods in the rar

4. Describe the Issue
When units got pushed from an AI founding a city, military unit and GP that were on the same tile got pushed to different tiles, exposing and immediately killing the GP.
I don't know if great generals count as civilian units but I first thought about how civilian units move with retreating military units and thought it would make sense that they move together when pushed around even on peaceful situations.

---

_5. Save Game From 1 Turn Before
Included in the mods RAR. This save has all moves done already for the turn, just need to end it and watch the AI moves.

[danielsolaro]

Excuse-me, just edited VP version (its 4.16) and added a screenshot before the units are pushed around.

[azum4roll]

Not sure if feasible to add this behaviour.