Sync with upstream release 2.1.0 #6

Merged
chris merged 3 commits from wip into develop 2024-08-20 14:22:16 -04:00

3 Commits

Author SHA1 Message Date
80c1e0a09c Revert changes which are not needed 2024-08-20 14:20:02 -04:00
862908fe0c Sync with develop branch 2024-08-20 14:12:31 -04:00
fa7f4d0e31 sync with upstream; re-work in progress 2024-07-16 15:19:12 -04:00