By Vincent-Michael Cherry pick from https://gitlab.com/trinitycore/TrinityCore_434/commit/13e8e235bf048f2daa583bab70d6b727e6890327
By Vincent-Michael Cherry pick from https://gitlab.com/trinitycore/TrinityCore_434/commit/13e8e235bf048f2daa583bab70d6b727e6890327