By: @Rushor @xfurry @Grz3s Closes #15246 (cherry picked from commit 6c5d473369511c84951f37f13f4898a3f92b0343)
hotfixes