Sync with TrinityCore/TrinityCore@908870e23fc6a49351c8f31e348775a943f2aaf6