Sync with TrinityCore/TrinityCore@3e33120dc880518cc4574259df6463ebad96caf9