XX-9535 Request to track config changes
Fixed problem with duplicate entries