By danlapps, closes #13054 (cherry picked from commit 223641168828b7b7731796d2ded7b31bf41d7f30)
hotfixes