By @Espionage724 Closes #15652 (cherry picked from commit 7f8d19e73e3d169777a60dd9346d64c04b21a004)
hotfixes