XX-9535 Request to track config changes
fixed several issues