(cherry picked from commit 37c4647f242c37f22c7ac455d304055441acf362)
Closes #4382 Closes #4383 Closes #4401 Closes #4407 Closes #4423 Closes #4474 Co-Authored-By: Stevie Robinson <stevie.robinson@gmail.com>