Merge master to api

Merge branch master into api