The changes needed seem to be in the `dev` branch. Can we please get this into `main` and have a release?