Thanks tkrokli for the initial research. (cherry picked from commit 12ff6d2f4fc3312eb676194defbcecc2d3998610)
hotfixes