by @untaught closes #3977 (cherry picked from commit 588b92ee0570146b37cd6211aeb32354781aada0)
hotfixes