By Tauriella, closes #16701 (cherry picked from commit f7a05eba638daba7e6a0fe780aeedeef04be8544)
hotfixes