By Malcrom, closes #2070 (cherry picked from commit 98a9f53dd9c80646b9ef26f501d7075daffbc2da)
hotfixes