By @pete318 Update #8988 (cherry picked from commit 0e945abfcece46927028418c07c07ed9c17ad2d9)
hotfixes