Revert to configChanges handling
Merge remote-tracking branch 'origin/master'