Stop unit teleportation on city liberation for both sides (request)

[Avallac]

When a city is liberated the faction that got their city captured and liberated remains at war with the newly liberated faction as well as the faction that did the liberating. However, all units from both sides (liberator and defender) get teleported in random directions. This can completely ruin a whole game if lets say you have a city and your entire army is parked around it but then someone just suicide rushes the city if they have the opportunity and instead of it just losing a pop and switching ownerships like any normal city when it gets liberated your whole army can be launched up to 4 tiles away right into enemy cities, forts, encampments and destroyed, not to mention not being able to recapture the city on the next turn as would have normally happened with a regular city capture. Same thing also happens to the liberator himself, say you capture a city and liberate it and then all your units get teleported wherever the game feels like which can even permanently trap them inside someone's closed borders, be trapped on a patch of land inside mountains, island, even ship can be teleported into an inland lake from the ocean that they attack a city from. This is obviously a design oversight and has been giving me a lot of cancer and even ruined a game recently (multiplayer). Would be great if someone could make a mod or at least tell me if there is some way to fix it in game files so that no units get ejected outside of liberated city's borders. Thanks.

 

[JJOne]

If the liberated city belongs to an existing civ with which you have open borders, your units don't get teleported away.
If you are liberating a dead city state, yes, and it is sort of annoying when that happens.