* cherry-pick https://github.com/trinitycore/trinitycore/commit/3b5014fdae
* cherry-pick small part of f4f7e6324d
Co-Authored-By: Shauren <shauren.trinity@gmail.com>
Co-Authored-By: Treeston <14020072+treeston@users.noreply.github.com>
* cherry-pick https://github.com/trinitycore/trinitycore/commit/3b5014fdae
* cherry-pick small part of f4f7e6324d
Co-Authored-By: Shauren <shauren.trinity@gmail.com>
Co-Authored-By: Treeston <14020072+treeston@users.noreply.github.com>