[RFR] Fix/ConfigChanges