10738 Commits (nc-refactor/swagger-api)