v5 update fixes #2

Merged
rlong merged 29 commits from v5-upgrade into master 2026-04-20 15:16:51 -04:00