XX-9535 Request to track config changes
Different fixes after first round of testing