Merge "Clarify uniqueness of some config items"