Fix swagger configuration
Merge branch 'swagger-docs' into staging

* swagger-docs:
  Fix swagger configuration