Merge "Changes to doc config"