3555f5916d
* cherry-pick commit (https://github.com/TrinityCore/TrinityCore/commit/2b1cde25604b6400ac327801d8e1649e30688f5a)