Merge spawnsystem branch changes