Closes #18339 Cherry pick from https://gitlab.com/trinitycore/TrinityCore_434/commit/294969887c6466eb24d6e6da6e9fe53d70f5f233
Closes #18339 Cherry pick from https://gitlab.com/trinitycore/TrinityCore_434/commit/294969887c6466eb24d6e6da6e9fe53d70f5f233