Closes #12796 Closes #17580 Closes #17574 (cherry picked from commit 931a7623b24831adf679e0581735375077c8d252)
hotfixes