Closes #16390 Closes #16708 (cherry picked from commit c4e4ee3ae10b1276b214c8b1da1281aba23ae57a)
hotfixes