Co-Authored-By: Zak Saunders <1936903+thezak48@users.noreply.github.com>
Fixes #5380 Fixes #5348 Fixes #5167 Fixes #5166 Co-Authored-By: Taloth <Taloth@users.noreply.github.com>