By pete318, closes #14387 (cherry picked from commit 7f9babe1d7bcee738d067ad472d496c3ade3463c)
hotfixes