By @Helias Closes #16131 (cherry picked from commit 614ae6cba93498bd153be6da79231c704d90b9ab)
hotfixes