Merging production friendly config changes.