Sync with TrinityCore/TrinityCore@e6b267a3529429479152883fb2894cb51dfb1dd6