Closes #17744 By Kodekc (cherry picked from commit a4e5c7545eb4a366edabd8bdeb6f7c50df484406)
hotfixes