Sync with TrinityCore/TrinityCore@42c230adabd3cdbc0b4d71ae2295edae20a3c008