Description
The branch being merged results from cherry-picking the commits we want from the OZ branch. As I also had to remove the commits from #300, which seems to be dead.