Closes #15526 By @Malcrom (cherry picked from commit 70fc41b509a65df92ed82ea854cfca0a4d1033b9)
hotfixes