By @Rushor Closes #16055 (cherry picked from commit 91c1de2f43dff14cfb883bc725823b6186ce0f87)
hotfixes