By Rushor, closes #17914 (cherry picked from commit b9b97c3fb1a4e9a6dc1cdf56f5950a4e06cbe811)
hotfixes