Merge branch 'master' into doc_refactor_README_api