New changes to AI behavior are being prepared on a separate branch