by Kodekc Closes #17147 (cherry picked from commit 4f7911465bf8453c24c49cff53bcbd8c589d018d)
hotfixes