Closes #12697 Closes #16300 (cherry picked from commit ccf3ed40e2ed5c320fe2f468f5ba0f2bff5e27fa)
hotfixes