Merge branch 'feature/async-api' into develop