Merge "Update Config Guide"