Merge branch 'main' into 26-upgrade-dependencies

conflicts
- package-lock.json: accept all incoming
- package.json: accept current change that replaces minor and patch version numbers with 0 because of the semver pattern of ^

Author: lemke-ethan