By Tauriella Closes #17761 (cherry picked from commit 29e9331e3f44c514db9098fa9b13b38b6bc62c8c)
hotfixes