Merge branch 'origin/feature/SpawnLogic' (reverted from commit b6f167521bf427f10e45439d6e1fe0c4bd9cbd03)