api-rework merge version 0.9.0