by Kodekc Closes #17194 (cherry picked from commit bd1347569773b73bee3ae18323cc1cad9aa57f60)
hotfixes