Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
Fixes #2595, fixes #2594, fixes #2593, fixes #2592, fixes #2591