Last commit before breaking changes for 0.10.0