Ensure the stability of the feb2023-overhaul branch after merging #21, so that it can be itself merged onto the master branch.