3669144099
* cherry-pick commit (https://github.com/TrinityCore/TrinityCore/commit/ad96f1fd78f26a304e56c37495017d14aa34c9c0) * cherry-pick commit (https://github.com/TrinityCore/TrinityCore/commit/66abca15933fcc6bfdd6dba71ee725da4e906af3) Co-authored-by: Shauren <shauren.trinity@gmail.com>