Merge branch 'refactor/common_api' into 'develop'