Cherry pick of https://gitlab.com/trinitycore/TrinityCore_434/commit/6007e7f818f85a7630ed526d856d63096df041eb Closes #20884
hotfixes