By @Killyana, Initial work by @Kirkhammett Closes #1866 (cherry picked from commit 210e45e303b1ae33ff4bb2c21727b27ae58f0a6c)
hotfixes