By Rushor Closes #18569 (cherry picked from commit 71758db8b3d3fcc351d21e8ef83b4647f99be08a)
hotfixes