XX-9535 Request to track config changes
Added several fixes and improvements