Tentative merge of #2108 into the 1.16.5 version
It still contains compile errors, but no merge conflicts
Some places have functions with unmapped names that I cannot identify, but no longer exist - fixing those will need to come last
Requires its sister LV PR
Tentative merge of #2108 into the 1.16.5 version It still contains compile errors, but no merge conflicts Some places have functions with unmapped names that I cannot identify, but no longer exist - fixing those will need to come last Requires its sister LV PR