Changes

#REDIRECT [[Platform Team/Server Kit/1.3/Todo]]