Sync with TrinityCore/TrinityCore@69544249ee99cf92985b277c276229ecaa6baf65