First commit of api code
Start local debug server if run manually
Merge branch 'develop'