Merge "Fix DOC config files"