Merge branch 'feature/cleanup-api' into develop