By Rushor Colses #18575 (cherry picked from commit f40cc639127b0f522772c20fb560f0ac6aafd389)
hotfixes