Sync with TrinityCore/TrinityCore@1010e140bf311500475e9440f88558279c496dd0