Merge branch 'ao/config-api-doc'