Conflicts: src/server/worldserver/CMakeLists.txt
(cherry picked from commit aa3020c26d54fa63fde16c5a765b1d72649c7e30)