By Saben65, closes #16521 (cherry picked from commit bc637c5b1cc097ce8e00ab5bea00c905fa084e8b)
hotfixes