By Nyeriah, closes #14482 (cherry picked from commit fae3e77376bae9a3bd5c969adfc2d4e96a9653d0)
hotfixes