by tkrokli Closes #17179 (cherry picked from commit 4ebed6e586b00051333f11dcf60c680a4ad13db9)
hotfixes