By Kodekc Closes #17788 (cherry picked from commit 2c8da5e174eb71b442ebd8a00a2d43bd9daa4c70)
hotfixes