Teams and AI surrender

Picked up one of my multiplayer saves and converted to SP.  My buddy's race, Altarians, was on my team (1).  His race was surrounded by enemies and eventually lost a key planet to an aggressor.  The AI then surrendered to....a random neutral AI.  I was on the best terms with the Altarians, and we were on the same team (1).  Could we please program to the game and add a single selection statement: if surrendering is true and is on a team and team has alive members, then surrender to a team member.  I don't care if a random element remains within the team.  Teams should be 100% guaranteed to take over surrendering team members.  Should randomness or faction like preference be an attribute, then the team member with the highest favor/diplomacy should have the highest chance to take over.

I never minded AI surrender in the previous GalCiv games.  There was a bit of randomness to it, but the AI usually surrendered to me because I was on good terms with the weaklings whilst mustering strength against the strong.