Spawn positions fix and linked aggro (cherry picked from commit 608d23fb1e2f2eaa1c3b155f8da4aa7fd02dbe8b)