Include configuration changes
Merge fix