Merge "docs: Update configuration related docs"