by Rushor Closes #18444 (cherry picked from commit 201d99077736735e96889278f9cd04b5ba089f41)
hotfixes