By Saben65, closes #16986 (cherry picked from commit b0f9a998e18724f765bbc673f76bb509a9367c7a)
hotfixes