I want to bring it back to status-quo of HWS 7.X first.
If it worked in HWS 7.X and is a problem now, more things have changed and I will look closely again.
Keep in mind that splitting factions in a smart way can’t be controlled by us - only with some weird rules, with too much efforts for that short amount of time now.