(cherry picked from commit https://github.com/The-Cataclysm-Preservation-Project/TrinityCore/commit/e619492a194bc09feb2fb30c50df4edbbcdc87bf)
(cherry picked from commit https://github.com/The-Cataclysm-Preservation-Project/TrinityCore/commit/e619492a194bc09feb2fb30c50df4edbbcdc87bf)