by Kodekc Closes #17146 (cherry picked from commit c461e21e2058feb19247154199bbe51f0f1683d0)
hotfixes