Updates https://github.com/TrinityCore/TrinityCore/commit/395242a437f414b6c64f3a169dfb7fc6f9d725ed (cherry picked from commit 9962629a60077ccd7776ad7d97d530d6373504bf)
Updates https://github.com/TrinityCore/TrinityCore/commit/395242a437f414b6c64f3a169dfb7fc6f9d725ed (cherry picked from commit 9962629a60077ccd7776ad7d97d530d6373504bf)