Merge "[AAI] Fix doc config files"