By sirikfoll, closes #17935 (cherry picked from commit a573e8f680429c03abba6e04f9bc326a0ebfb378)
hotfixes