7115f353cc
* cherry-pick commit (https://github.com/TrinityCore/TrinityCore/commit/cf223370f3345a7cfa39f8bfb23835391603f985) Co-Authored-By: Wyrserth <43747507+Wyrserth@users.noreply.github.com>