Update to rapi 0.10.x