Merge branch 'hotfix/fix_api'

* hotfix/fix_api:
  trying out api test
Merge branch 'develop'

* develop:
  api controller test
restore api controller
Merge branch 'hotfix/fix_api_controler' into develop

* hotfix/fix_api_controler:
  restore api controller