Merge branch 'feature-api-module' into wip