Merge !71 along with CI fixes
This merges !71 (closed) along with other CI fixes; we can't merge otherwise because of those test failures.
Checklist
-
Code modified for feature -
Test suite updated with functionality tests -
Test suite updated with negative tests -
Documentation updated
Reviewer's checklist:
-
There is a test suite reasonably covering new functionality or modifications -
Function naming, parameters, return values, types, etc., are consistent with other code -
This feature/change has adequate documentation added -
No obvious mistakes in the code